cached rates

6 files changed, 22 insertions, 13 deletions

diff --git a/src/routes/(app)/[username]/(profile)/+layout.server.ts b/src/routes/(app)/[username]/(profile)/+layout.server.ts
index 0ed3edb8..70e7ebdb 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.server.ts
+++ b/src/routes/(app)/[username]/(profile)/+layout.server.ts
@@ -1,8 +1,10 @@
+import getRates from "$lib/rates";
 import { get } from "$lib/utils";
 
 export async function load({ depends, parent }) {
 	depends("app:user");
 
+	const rates = await getRates();
 	const { subject, user } = await parent();
 
 	const { follows, followers } = await get(`/${subject.pubkey}/count`);
@@ -12,5 +14,5 @@ export async function load({ depends, parent }) {
 			() => [],
 		);
 
-	return { follows, followers, followList };
+	return { follows, followers, followList, rate: rates[subject.currency] };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 98d4238b..3887d026 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -25,10 +25,10 @@
 
   let {
     events,
+    rate,
     user,
     subject,
     src,
-    rates,
     text,
     follows,
     followers,
@@ -292,13 +292,13 @@
         <div class="my-auto mr-1">1</div>
         <img src="/images/bitcoin.svg" class="w-5 my-auto" alt="Bitcoin" />
       </div>
-      <div>&#61; {f(rates[currency], currency, locale, 0, 0)}</div>
+      <div>&#61; {f(rate, currency, locale, 0, 0)}</div>
     </div>
     <div class="text-secondary flex ml-auto">
       <div class="flex items-center">
         <iconify-icon icon="ph:lightning-fill" class="text-yellow-300"
         ></iconify-icon>
-        {s((1 * sats) / rates[currency])} =
+        {s((1 * sats) / rate)} =
         {f(1, currency, locale, 0, 0)}
       </div>
     </div>
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.ts b/src/routes/(app)/[username]/(profile)/+page.server.ts
index a7fb4f19..5f0e7579 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.ts
+++ b/src/routes/(app)/[username]/(profile)/+page.server.ts
@@ -1,11 +1,15 @@
+import getRates from "$lib/rates";
 import { auth, get } from "$lib/utils";
 
-export async function load({ cookies, depends }) {
+export async function load({ cookies, depends, parent }) {
 	depends("app:payments");
 	depends("app:items");
 
+	const { subject } = await parent();
+
 	let accounts = [];
 	if (cookies.get("token")) accounts = await get("/accounts", auth(cookies));
 
-	return { accounts };
+	const rates = await getRates();
+	return { accounts, rate: rates[subject.currency] };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index eb21a45c..25728372 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -14,9 +14,7 @@
     preloadData("/send");
   });
 
-  let { accounts, subject, user, rates } = $state(data);
-  let { currency } = $derived(subject);
-  let rate = $derived(rates[currency]);
+  let { accounts, subject, rate, user } = $state(data);
 
   let install = async () => {
     if (!$installPrompt) return;
diff --git a/src/routes/(app)/[username]/receive/+page.server.js b/src/routes/(app)/[username]/receive/+page.server.js
index b73b1d6a..0203285e 100644
--- a/src/routes/(app)/[username]/receive/+page.server.js
+++ b/src/routes/(app)/[username]/receive/+page.server.js
@@ -1,7 +1,13 @@
+import getRates from "$lib/rates";
 import { redirect } from "@sveltejs/kit";
 
-export const load = async ({ cookies, params: { username }, url }) => {
+export const load = async ({ cookies, params: { username }, parent, url }) => {
 	const token = cookies.get("token");
+	const rates = await getRates();
 	if (!token) redirect(307, `/pay/${username}`);
-	return { text: `${username}@${url.host}` };
+	const { subject } = await parent();
+	return {
+		rate: rates[subject.currency],
+		text: `${username}@${url.host}`,
+	};
 };
diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte
index bcb9e4ff..28d33754 100644
--- a/src/routes/(app)/[username]/receive/+page.svelte
+++ b/src/routes/(app)/[username]/receive/+page.svelte
@@ -27,11 +27,10 @@
 
   let showOptions;
 
-  let { id, rates, subject, user, text } = $state(data);
+  let { id, rate, subject, user, text } = $state(data);
   let locale = loc(user);
 
   let { currency, username } = subject;
-  let rate = rates[currency];
   let type = types.lightning;
   let hash = "";
   let qr;